Merge changes I38c31645,Ib6f61b81 into oc-mr1-dev
am: 9d7cf1434f

Change-Id: I79cdd12cae7ae31543f2c5b85598de0967ce4a47