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

Change-Id: I3b122910bee22bb591ccc54d795d67e7edd22c68