Merge "Merge changes from topic 'am-741c581f8eb94608b55e1eed88e6a161' into oc-dr1-dev-plus-aosp am: d9b007cd04" into oc-mr1-dev-plus-aosp
am: 0586208807

Change-Id: Iefad6c3226256bcc46b984735465901d7e30f8cb