am 17f64cac: Reconcile with jb-release

* commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':