am 389a4eeb: Reconcile with jb-release

* commit '389a4eeb187fdbc5fd1f7caf5dff90f8a6e1d37a':