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

Change-Id: I1de989ab9a2751ae2ab86683e7461c70079f1db4