Merge changes Ia1fa4a32,I2a4c3d9f into oc-dev am: 6d957ec373
am: 2a250ba0b9

Change-Id: I8c6a68c34e780fdb1a598a98575316a7a4f67745