Merge fixes

Change-Id: Ib1c1a9adb12c4d0b0a7c4edff972733b1557a283