Merge "Add Fastboot support for flashing secondary images" into nyc-mr1-dev