am e9792f85: Reconcile with jb-release

* commit 'e9792f851553841b9308a0527535105a0c6c2286':