Merge "Perfprofd: Fix tests"
am: 1261ab9d8d

Change-Id: I02bae8a500f5b394f6e83b1e85cc6b8ace1ba755