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

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690