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

Change-Id: I3a0096432cad3dad8fd283ace19fc21d64d9c42e