Merge changes from topic 'am-4d21b9824d8247648c328224f533af1e' into oc-dr1-dev-plus-aosp
am: e1b89590cc

Change-Id: I6a64ecc1d18b6fc0a101199bb67dfa40ae408379