Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev am: 5df218c5c4  -s ours
am: 92502878a1

Change-Id: I42ba60d66511f569c40677dd834d2a045328465f