Merge "Remove unused function GetPidByName()" am: a152e0f75f am: ca8c3dedaf
am: fba921f426

Change-Id: Iad191e87a2d4cf07ae4190978dbe3f8e769d8ee7