Merge fixes

Change-Id: Iedb322c7ec87945ac64131c15a1ace4e9e8781d4