Tidy up imports Use `import static` instead of explicit references in the code. Change-Id: I4ce04b325ccfe940ce51457c332d59288aee7543