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

Change-Id: I527f6405642f1e195f388d3c994ed249315fded2