Merge "Revert "Remove dist-for-goals call for gtests.""