Merge fixes

Change-Id: I8e3ff663dc8900e4ebebc591ccd642ef061e2ebe