Merge changes Ie1686719,Ie6af7751 into oc-dev am: ba911a25bb
am: bbdf892407

Change-Id: I2305ec1268fbc4be9aed96da07e147f827e4e7bc