Merge "Change @return-taint to use onlysafefor_html instad of escapes_html"