Merge fixes

Change-Id: Iaa4186e2a5472c650bd5fbfe8104820b023a7005