Fix merge taint

Change-Id: I568a08e12ba80ff62b5a90791e91694a1b1cc39a