Merge "Revert "Save power component names in the summary parcel for MeasuredEnergySnapshot"" into sc-dev