Merge "Perfprofd: Minor fixes"
am: 2f1ba71c04

Change-Id: I4c5302a6c32294d4713113d997221c31865f4824