Merge "switch logging to proper usage"