am c24b5621: (-s ours) Merge changes I2e5515ef,I3b807e3e

* commit 'c24b5621c405d0151959ee1e1440c3b58e7f6b3f':
  Add new error codes for rate-limit and max-use failures.
  Update comments on now-unsed user ID and app ID tags.