Merge "Check CPU time_in_state from one place" into sc-dev