Merge changes Ib7268cbf,I6658edb7,I4f19c31c into oc-dev
am: 7ef1ce5eb8

Change-Id: Ibaf5545800ed1f9ce0d73f592fc396712a910174