Fix taint

Change-Id: I142440bd0e26318afc7f05e5a399bccc8ac42efe