Merge "Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc5168281 am: 1ccb15b7d3 am: 3ceb4bd3ed am: 4c007a1345 am: b9db7e9361"