am 82bde8f8: Reconcile with jb-release

* commit '82bde8f8661400798eb7718430c71d9d90b78844':