Merge "Fix DynamicSystemClient.start() exceptions"