Merge "Remove unnecessary system_server keep rules"