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

Change-Id: I59e0a3f49e0d0bf7fbe1e5429098e0ab4b10a020