am b6b9f0a6: Reconcile with jb-release

* commit 'b6b9f0a6b1e7a4b1a55674bb75ea81af121b4279':