Merge "Revert "fix broken build on erorrprone"" into tm-dev