am 3166fd6a: Reconcile with jb-mr1-release

* commit '3166fd6ad9a893f26e4f881328243fdfd8c6c029':
  JOO26B
  JOO26
  JOO25
  JOO24B
  JOO24