Merge changes from topic 'am-562e4c1104d5496486626a37985ad1ae' into oc-dr1-dev-plus-aosp
am: 6180a37aac

Change-Id: Icf586c08d9caa1ee2ab40b616da542724464b9e3