Merge changes from topic "cputimeinstate-cp"
am: 8e7f193ba7

Change-Id: I6dc16ef97bc807ad0e1fc6747d9a0bc6d0148af6