Merge "Remove unused function GetPidByName()"