am ef3a5321: Reconcile with jb-release

* commit 'ef3a532141e02d529dd5c61716c2fd4654ddc025':
  JRN80