Add maximum timestamp to the payload. am: ccb01b2a3b am: 1ad73c7db3 am: 371f15b505  -s ours
am: 2c7e552c1b  -s ours

Change-Id: I623cd0a2cb5c7664243456987ffd17b1ef860943