Merge changes I4ae01109,Ib45289c3 into oc-dev
am: eda3e8c3d9

Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026