merge fix

Change-Id: If278fcfdfb4505758fe4e2969ddc998d6795e150