Merge changes from topic 'am-cfcc6c733d6941928d5ef4ce29009232' into oc-dr1-dev-plus-aosp
am: 864d49d8b7

Change-Id: Ib96cac0c629f88155dd192e52f04c87d041e7aa6