Merge "Fix import paths for LogCatMessage"