diff --git a/.gitignore b/.gitignore
index 2d5e737..78d2b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
-/.buckversion
-/.buckd
-/buck-out
-/bucklets
-/target
 /.classpath
 /.project
 /.settings
 /.primary_build_tool
 /bazel-*
+/eclipse-out
diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
index 871740e..6b9e2c0 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
index 789d795..fe5114e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index 88e9bc0..4f27f5b 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -1,7 +1,7 @@
 Build
 =====
 
-This plugin is built with Bazel or Buck.
+This plugin is built with Bazel.
 
 Two build modes are supported: Standalone and in Gerrit tree. Standalone
 build mode is recommended, as this mode doesn't require local Gerrit
@@ -10,8 +10,6 @@
 Build standalone
 ----------------
 
-### Bazel
-
 To build the plugin, issue the following command:
 
 ```
@@ -39,8 +37,6 @@
 Build in Gerrit tree
 --------------------
 
-### Bazel
-
 Clone or link this plugin to the plugins directory of Gerrit's source
 tree, and issue the command:
 
diff --git a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
index 532997c..b2a015c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
index adec853..a73da44 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tools/sonar/sonar.sh b/tools/sonar/sonar.sh
new file mode 100644
index 0000000..8df06d3
--- /dev/null
+++ b/tools/sonar/sonar.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+`bazel query @com_googlesource_gerrit_bazlets//tools/sonar:sonar --output location | sed s/BUILD:.*//`sonar.py