am 97ade339: Reconcile with jb-release

* commit '97ade3390c66c145f94e497464947c581b60308d':