Merge "Perfprofd: Fix tests"
am: cd270095ac

Change-Id: Iba04dffb0776038479c74b6dc8c97cfd06aca99c