Merge "Decrease OTA package verification times further. am: dd895d0 am: 5be36da" into nyc-mr1-dev-plus-aosp
am: 2103472

* commit '2103472898e3a58efb52c778a7c41df9c5b0d7a3':

Change-Id: I12be28a8544dc4535ada80cdf9ce94397292bfcb