And some more merge fixes

Change-Id: I6d3471c20e55776e75f3474b57c7db052d04b995