Drop pid field as Pid is preferred

Within this change we assign to Pid field value coming from
pid, and in the end we drop pid, as its not required (Pid is
preferred).

Change-Id: Ia4e8c512224998e6e7ca5915ba3d278fdcbeddcb
Partial-Bug: PROD-18295
1 file changed