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

Change-Id: I5864ffe3c86cfe0d9781756686d223bc33d3e646