am 5e966ef6: Reconcile with jb-release

* commit '5e966ef64bda21a14b5f835040f515932c52e966':