Merge "Remove the workaround for b/222070055." into tm-dev