Merge "Fix typo in SystemServer"