Merge fail fixups

Change-Id: I2b56ad4eb7f9ef62b52623a1eaa93a2b1252fbb5