Merge fix

Change-Id: I7c351fad5365cabbeb0e0253638b0a0e48d6247b