Merge fix

Change-Id: I45bb23298e2f6e70c09623d099033913efb21375