merge fix

Change-Id: I11ec1d362e201d3fed67d0b52150ef45bad0f1e0