am b7f82c7c: Reconcile with jb-release

* commit 'b7f82c7c4022a885314cce3a34d9d94dd3186b89':