Add maximum timestamp to the payload. am: f8527ada7b  -s ours am: 962bfa3b27  -s ours
am: ace31a8858  -s ours

Change-Id: If8f25b841b9b343f02d17e1dde68affe4b16acbc