Merge "Remove system_server_current related work arounds"