Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev
am: 258f04a556  -s ours

Change-Id: Id22475574e2ad723c4ebfb79c9b6e727db41f2d8