Merge fixes

Change-Id: Ib954ca7b2ecd8b6fc06add8b43e8f2da7d8764e2