Merge "Perfprofd: Fix counter tests"
am: 27de2468b3

Change-Id: Ia6f984721e4d223da2221f95e8e99320bd94f0af