Merge "Added mitigation for b/122921367"