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

Change-Id: Ic2e9ff1ec09f81a6fc960663c4e3bca397d7784e