am 2038ce86: Reconcile with jb-release

* commit '2038ce86dc13bff315fa2ec1044a58ddc1f3183b':