am 91e47177: Reconcile with jb-release

* commit '91e471772f1acb4786d95c08f1d296ff8ffe2efb':