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

Change-Id: Id85a60ce2e4e30323b643cbf99136a3b596e6187