More merge fixes

Change-Id: I13f256fd7ff3cef10522cb7f83a89c8f1e6c6b59