am f632562f: Reconcile with jb-release

* commit 'f632562f7d2e94978d185d192a62eb73925a59a2':