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

* commit '51d22d7ea92e77f47accee59c99cb8157bf29fcb':
  Eliminate duplicate constants