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

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