Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5
am: ea43cfbea1  -s ours

Change-Id: Iab2f6f021ff2269475898c6bb362fb67518bf59d