merge fixes

Change-Id: Ibca73c7099739790e1659a24841f168a2c06b71e