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

Change-Id: I86335d49c475d4b78a0e53ca534c6c20f1b0f6b7