Merge fix

Change-Id: I40dece14213397a0fe8a7089237c6302bbca14ff