am b3192c5a: Reconcile with jb-release

* commit 'b3192c5abf7321cb3437a3aedacd632311634bff':