Merge changes I68845552,I2654f228,Iefc65c60,Ia020815c,Ie74a1aa0 into oc-dev am: 1a5c26c9f0 am: e4f42818e6

Change-Id: I0c066127cdce36fb6dc544619b846587c29756dc