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

Change-Id: I1db61e09a632d8587868ec6d28886965cd90dd35