Fix taint

Change-Id: I1e3f0a3518f53d61ae7257d3e60eb7dcb9709053