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

Change-Id: I3ab675379c82858fdd22cbaf51d5870de9198f70