am 08af220f: Reconcile with jb-release

* commit '08af220f23dac240eafe8ba1b58c808931e2adb7':