Cleanups on system power logging format
Merge branch 'system_power'