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

Change-Id: Ie541540172e4e34869d37ae7f4824d055a363ef1