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

Change-Id: I75be57c830552182f5f8a8c61acf78d7b58c7848