Merge changes I4b58610f,Ib758756a into oc-dev am: a9873bc8f6
am: b3b191e340

Change-Id: Iaa1837d9da020b848e79c74962589c67c6598ac4