am 5a846f38: Merge "Improve a constant name and related comments."

* commit '5a846f3874cc3e0fa67e5dee1c5a8f83d9d440d6':
  Improve a constant name and related comments.