am d62bf8fb: Reconcile with jb-release

* commit 'd62bf8fb254b3f27c0170c5d96424ae93afce5ad':