Merge changes Ia5d46ad8,I60cec00d into oc-dr1-dev am: e65f392b6f
am: 94310da891

Change-Id: I2d7e27e84f21829ba56f4b8f5fd19f679e61333a