Merge "Perfprofd: Fix tests" am: 1261ab9d8d am: a0f59a9dc5
am: 0072192791

Change-Id: I4c3fbc54ec6dad0e4f887206674a0ce63cd67a31