am 91ac74bb: Reconcile with jb-release

* commit '91ac74bb27ce99552e4bd428548ed12f7f61ddc5':