Merge fix

Change-Id: Ia5fcc2c6c2d4be4f53e59d5c014fb24c6690cfe7