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

Change-Id: I03609193c4e9d8c00011bba63831342a39ce7cd3