Merge changes I6f00614d,I987eeab2 into oc-dev am: c273784c91
am: 3b447f6ed7

Change-Id: Ia6c35dd4a3fff3c300cb8c390d9628481605928a