merge fix

Change-Id: Icf351c22a08055d0ae1cc358dc078c89bdc10a31