Merge "Add 8 missing mShouldTestTelecom checks"