Merge "Removing FilteredLogcat files" into main