Merge fixes

Change-Id: I20491befb6392cd4ff9c313352aec92d286e2c1f