Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev