am 14c31bdc: Reconcile with jb-release

* commit '14c31bdc30d115113575b75abfe01a639a3a6a12':
  JRO02C
  JRO02B
  JRO02