fix merge taint

Change-Id: Iac65f8b0766f70cb73d68f1c8f65bbd997447951