Merge "Reduce/Fix system logging"