am 7db2f5bf: Reconcile with jb-release

* commit '7db2f5bf24c20c613c0f76a19e810f91e752976c':