Merge branch 'stable-3.1' * stable-3.1: Remove unused import Format java files with google-java-format Change-Id: Ifeaa80b0e29a1200be4afba481dc28fa3cb9a99a