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

Change-Id: I9fad200f94443f906cf7d53317db449543b5b6c6