Merge "Merge changes Ib6f339a4,Ib3cc0d8d into oc-dev am: 4de20d52 am: 25c9339b am: 7b75ed10" into oc-mr1-dev-plus-aosp