Merge "Revert "Revert "Added mitigation for b/122921367"""