Merge changes from topic 'cherry_ota_dexopt'
am: 0ac1aa8256

Change-Id: I737cec666ea0cb5b7aecec02fd70efa9cc833129