am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev

* commit '6c269982f3b188b5d7f70fcb670ab191b39b2689':
  Use plurals for the developer steps countdown