Fix merge taint

Change-Id: I06b19c61cb6f8e2d1897a6083af17ee9071e4e7b