Merge "API review followup: DynamicAndroidClient"