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

Change-Id: I4ccc8c61cdde7ca54857bd071e6f7da0761d9a70