Merge changes Iab5fae74,I3d5076ca into oc-mr1-dev
am: 709613d4c8

Change-Id: I29bd3eed18b74d4cfbd699deea24477f0a3e5d76