am 345ca5a1: Reconcile with jb-release

* commit '345ca5a104eb6e867a9ad982e1b3f6d037ba0171':