Merge changes I2f531131,Ibaaca2a1,Ib0cba4c7,I5ea748b8,I046e3f07, ... into oc-dev
am: 42b5469646

Change-Id: Ifc5e39570cbe69eb26820ba8abc482fbe5744306