Fix some merge taint

Change-Id: I61d81c7af87a46b03d348db25e50d08763074e1c