Merge "Fix index error" into pi-dev am: ae2f368907
am: 571c29428f

Change-Id: I000ceafa631ce39777eb1ef80503b7021de42170