Reset payload index in payload state. am: 97eba34594
am: 97eb291f3f

Change-Id: Ie46d4b5c396c06e2061300f96c26cee1e9f7f2fe