am 5ff025a5: Reconcile with jb-release

* commit '5ff025a50ccd7d30ea39c989d9ed8b1084ded47f':