am 61a2d05f: Reconcile with jb-release

* commit '61a2d05fe351250f8378cfccdf65b283200151cd':