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

Change-Id: I975c28ce923c101952ca40719473d56f19ac4856