Use indexed bounding box

Change-Id: I65b27ac513000fe3b1995762b2641efbc87db58e