am 31b52351: Reconcile with jb-release

* commit '31b5235147b986d4c6e18e96309581c74c634c27':