Merge fix

Change-Id: If64b9f747914c865a02081f5a1756174e16da8c7