Merge changes Ic9c27552,Ie3980cd5,I42bf2bdc into oc-dr1-dev
am: 46163119d5  -s ours

Change-Id: Ibe5f3fab487212ca81f4da95a7f3d4526206ed30