Add maximum timestamp to the payload. am: 8d853bab09 am: d7edd85fdf am: d494488b30
am: 0b6878b7b6  -s ours

Change-Id: I8cdd598a1eae2c8b92c65a706b18bd5430ab389c