am 568ee0d1: am 51d22d7e: am afab5a70: Merge "Eliminate duplicate constants"

* commit '568ee0d135c23c5a49fb4f93de01999b76523428':
  Eliminate duplicate constants