am 19031d51: Merge "Define missing static constexpr variables"

* commit '19031d51ab9edfc3b1996891d654a6b86ca937c0':
  Define missing static constexpr variables