Merge changes I1ed97f98,I32449355,I5c84d6f2,Ib9652278,I73deaa44 into oc-dev am: ba55e0e5c8
am: bf3dcdc535

Change-Id: I269d6e860c0d96dde1c16d7cb6f2e6c398d2a72d