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

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