Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev am: f512575c68
am: 169989822e

Change-Id: I330cd6e1601584e3903a26b27047aae2e7b7c711