Window > Preferences > Java > Code Style > Formatter > Import > Import etc/eclipseFormatterProfile.xml
Then import the "imports" settings file
Window > Preferences > Java > Code Style > Organize Imports > Import etc/eclipseOrganizeImports.importorder
Avoid using auto-formatting - "Ctrl + Shift + F" for an entire file while changing a part of the file. Especially for an existing file as it makes it difficult to know the exact difference by comparing revisions.