am c8cff90d: Merge "Use a named constant rather than a magic number." into jb-mr1-dev

* commit 'c8cff90d49b6eeaf0290c16517ff49df185dbdcd':
  Use a named constant rather than a magic number.