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

Change-Id: If921977ee1ff0df1c38288d06d844b2694c0d471