am 7c94f9d8: Reconcile with jb-release

* commit '7c94f9d8e07d17803c2b45ac6e115da3fe8827a4':