Fix merge taint

Change-Id: I1d5b2b24e52895f735948a8e7315a43f9aa2c4cb