Merge "Switch to tron events for battery saver logging"