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

Change-Id: I0aaae022f62cde8fab51c258313b00764a0ce799