am 4af7837e: Reconcile with jb-release

* commit '4af7837eac062cc96958be2981a39274a497f555':
  JRN84B
  JRN86