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

Change-Id: I656c817338e6b1921213478cdb4f98923561487e