Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev am: 947be6bed9
am: c40344bf86

Change-Id: I849b78ceb45e22ab1b63bf4fbb88aac40625fd22