Merge "Clean up server_configurable_flags test prop"