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