Merge "Remove java generated files" into main