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

Change-Id: I1236dc30b5092318e596904a86a3df8c74fda960