am 589cdbed: Reconcile with jb-release

* commit '589cdbed556fd38a95895ab684dbcded7f4851e9':