Fix merge taint

Change-Id: I835895da0cc20ef334e6736e5107dc8a15e8cc21