Merge "Perfprofd: Fix test expectations"
am: 8460bc77cf

Change-Id: I72d350d31bb0a19e9b851d37456055fafc5be904