Merge "Make ContextHubClient.getId() return a 16-bit value"