am 1d81bd90: Reconcile with jb-release

* commit '1d81bd907f3fe7c642ed45f18049236305ed1e3f':