Merge "Change TextAttribute constants to be consistent with the test and RI."