more merge fixes

Change-Id: I1cfe51994b2ba42d9a9e74d12862e3d874d39b11