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

Change-Id: I8eca7a11900777034f094d5e102734f43afc89f2