Merge changes I9f0e1a18,I13402736,I570ed879 into oc-dev am: 7a8fcf1492 am: b8f24559ae am: fa9a95365c am: d3611be019 am: 330ba8708f am: 768316fe04

Change-Id: Ic9395e81ebe3b9c2af18b94fc01007644899dfa7