Merge changes from topic "bgdex2oatd_cherry_pick"
am: e1dfc74b1a

Change-Id: Id1756b86c6fd0840f83a0f5f16e8962dc4307e93