Add maximum timestamp to the payload. am: 8d853bab09
am: d7edd85fdf

Change-Id: I3bbcc7828cb41c791ef23ffffca071b006574fe9