fix cpu measurements

Change-Id: I38bf0ab2e9711979db572a66fb318382933a1686