Merge changes from topic "bgdex2oatd_cherry_pick" am: e1dfc74b1a
am: ea03927cea

Change-Id: Iba12335e4aefa6dfba7d03dc15baa51253be2108