Merge changes from topic "bgdex2oatd_cherry_pick" am: e1dfc74b1a am: ea03927cea
am: c834ab8099  -s ours

Change-Id: Ifb6fc06aacd2ae1b0780377b319a0cf167891561