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

* commit 'c8104b0342382481704c6662af33968595ad6ab6':
  Change TextAttribute constants to be consistent with the test and RI.