Merge fix

Change-Id: I10a9e88ac171878e820e7fbd6e51ad22e38e2641