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

Change-Id: I732b93decc6ce9b3a846c971ff25484447ff9127