Merge "Check pids instead of IBinders"