Merge "Fix Logging for Topology Manager"