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

Change-Id: I939b38ed55d5348fecc896cb8f068841880d385f