am da1698d5: Reconcile with jb-release

* commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':