am bb87053e: (-s ours) [DO NOT MERGE] Making some constants public

* commit 'bb87053ef98014fb4693aa4ff7e9d44ca30f7b9a':
  [DO NOT MERGE] Making some constants public