am c653f73b: Reconcile with jb-release

* commit 'c653f73b28986a82f60a4ce7cf6741316a835229':