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

Change-Id: I2d02a72da297325464a4c587fd66c1642098ea6c