Merge changes I9f0e1a18,I13402736,I570ed879 into oc-dev am: 7a8fcf1492

Change-Id: I18b5582f6cf9eea795a0c1840180e2d421d95410