Change to use pgrep and kill only current user

Change-Id: I2403d196f572f3020012226bccaee2b243a26b06