Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev am: 4faae82855
am: b18196e025

Change-Id: Ibfa03f958d7d7a2cfa3d5cbe1a1b1e87329ea11a