diff --git a/android/config.go b/android/config.go
index cafc71b75..aeed81dfa 100644
--- a/android/config.go
+++ b/android/config.go
@@ -337,8 +337,8 @@ func NewConfig(srcDir, buildDir string, moduleListFile string) (Config, error) {
 		config: config,
 	}
 
-	// Sanity check the build and source directories. This won't catch strange
-	// configurations with symlinks, but at least checks the obvious cases.
+	// Soundness check of the build and source directories. This won't catch strange
+	// configurations with symlinks, but at least checks the obvious case.
 	absBuildDir, err := filepath.Abs(buildDir)
 	if err != nil {
 		return Config{}, err
diff --git a/java/java_test.go b/java/java_test.go
index 73e6792b4..582ebe945 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -489,7 +489,7 @@ func TestHostBinaryNoJavaDebugInfoOverride(t *testing.T) {
 
 	ctx, _ := testJavaWithConfig(t, config)
 
-	// first, sanity check that the -g flag is added to target modules
+	// first, check that the -g flag is added to target modules
 	targetLibrary := ctx.ModuleForTests("target_library", "android_common")
 	targetJavaFlags := targetLibrary.Module().VariablesForTests()["javacFlags"]
 	if !strings.Contains(targetJavaFlags, "-g:source,lines") {