Merge "Reland revert of "Added mitigation for b/122921367""""