Merge changes from topic \'ab_ota_dexopt_target_slot\' into nyc-mr1-dev
am: 84932f8053

Change-Id: I14d81e8b5f560532973bb810291fdbf28140924a