Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."