am ec0f69a8: Reconcile with jb-release

* commit 'ec0f69a81a4a8ce1c424ec5f4768e86548300891':
  JRN83