Merge changes from topic 'am-b3b1533d8b364e7f8891eeaf56e6baab' into oc-dr1-dev-plus-aosp
am: c15368ffb6

Change-Id: I77145b451d136a50c715947abdfc2069fc32e2d6