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

Change-Id: I4976a4c0a1110992b5f5537dfc12e94397f9579e