Merge change 8945

* changes:
  Expose type constants and accessor for unit tests.