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

Change-Id: I134e3526ef8c0445bb7b163a66fed81fce0802cf