Merge changes I12d46493,I0ed00441,I55e5dc5a,If61296ff into oc-mr1-dev am: c03127ef5c
am: be399346db

Change-Id: I6aac2c5e196fcb3df3c6490a0e12f11ebc886dc2