Reset payload index in payload state. am: 97eba34594 am: 97eb291f3f am: 3c1a3e60af
am: 1d817ac2a6

Change-Id: I372e45a66dcb570552e000cded59bc81a80743f6