Merge changes from topic 'cherry_ota_dexopt' am: 0ac1aa8256 am: 561a944ad7
am: a014598df2

Change-Id: I6ec67bff03aa915993d22cc3e57199eb3c5eead8