am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."

* commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a':
  Don't pollute the namespace for two uses.