Merge "Fix bad index usage" am: 5cfe8a8315
am: 83272db445

Change-Id: Ie20fd9eea99d4ec730e40045a693181da70ec786