Merge fixes

Change-Id: I2d6a1fa4bda443fe38e091c21a52e842953fa145