am 7d41f2f9: am dfab36f0: Reconcile with jb-release

* commit '7d41f2f9436ded0526d3d5dd59abca069ee8c0e7':