Underp merge taintage

Change-Id: I961428dc3f13b91f5242feb08800bebc18d9c4ff
Signed-off-by: DHOMD <DHO@dho.im>