Merge "Restrict system_server_startup domain"