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

Change-Id: I90d6bed8fd9260196c53d601ced220f52df9c9d4