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

Change-Id: Iebbc92fb4c77480693dc20b26f4ec2859bca9e88