Merge "add atoms for cpu power calculation"