Merge "api-review: add @Nullable for getFriendlyNames() and getServerUri()"