Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556  -s ours am: 478e5c3ff4  -s ours
am: 2b7db24048  -s ours

Change-Id: I4d8de9226362558034be3a166d4a2331827e0c1a