Reviewed-by: xdono

Summary: Added code to deal with the index case specially.
Reviewed-by: mullan

Reviewed-by: darcy, weijun