Merge fix

Change-Id: I168f15e71b7e850316fa857445ca79aba74703c1