am d23a3e37: Reconcile with jb-release

* commit 'd23a3e37680ee0b84bec0ada0ff8e64da79b805e':