Merge "Merge changes I901908d9,Iac9835ad into oc-dr1-dev am: 47aac56746 am: e2038e5709" into oc-mr1-dev-plus-aosp