am ad7c32bf: Reconcile with jb-release

* commit 'ad7c32bf2cdc135b827d60f5ce7a77b50b576395':
  JRN84
  JRN83D
  JRN83C