am 91bd59db: Merge "Move constants to the correct header"

* commit '91bd59dbda75d176a79d5c42cccce0a9b0391bde':
  Move constants to the correct header