Merge "Fix potential crash when per-procstate cpu times tracking is turned on." am: daddc5bb50
am: 38bbdb4de8

Change-Id: Ida95dd9ea6974d5a9c5b96d1cf9075fa6c2b5334