Merge "Perfprofd: Minor fixes" am: 2f1ba71c04
am: 4e25a52339

Change-Id: I06b90efc9c3e40525d9c90b35e53143e85ad699f