Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
am: 982ce6402b

Change-Id: Ic8c30fa320022bfc5233738f13f45bb4b30bb4e3