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

Change-Id: I976cbf1c49e33d3acb75e7fa7a2efacea4fe08bd