am 90d6a637: Reconcile with jb-release

* commit '90d6a637dc04a66d0833ebe4e30ff6ff1332da40':
  JRN84D
  JRN84C