Merge "Perfprofd: Fix tests" am: cd270095ac
am: 4aec82fd3c

Change-Id: I4bb4300786c9ab88d78f4296a52df1dd8ca6530e