Merge "Bug 1093: Extracted static inner classes from SchemaAwareRpcBroker."