Automatic merge from submit-queue Apply davidopps comments to TaintController PR Fix #41318 cc @timothysc @kevin-wangzefeng