Merge changes Ifaed1c65,I6ab89e0e,I24f46786,Idcddb109,Iee496c96 into oc-dr1-dev
am: 1f894b057b  -s ours

Change-Id: Ia7be228fc4dbfc23b586e31378d3bf10dd46430e