Merge "Fix unit issue in Slog.wtf output" into mnc-dev