Merge "Use predefined function is_system_uid()"