Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
am: c7d9294cd9

Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0