Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30 am: d35542316d
am: 9d11ec7bdc  -s ours

Change-Id: I4579bd3a0e40da263f8e14adf60c77173e8e6ab5