more fixes for merge taint

Change-Id: Ie2dc7eba612eb0d3bba5fa3165b1857bc9e26f2a