Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev
am: 29f38676eb

Change-Id: I2024cd2bfc04135a44ab67da2ea52975a266013d