Merge 322b6a259689c8d325c0b3ea9fe570be2d4c3129 on remote branch

Change-Id: I10161734196c8368350bfe001776e514970e0080

BUILD.bazel

@@ -16,4 +16,8 @@ define_modules("pineapple", "gki")
 
 define_modules("blair", "consolidate")
 
-define_modules("blair", "gki")
+define_modules("blair", "gki")
+
+define_modules("cliffs", "consolidate")
+
+define_modules("cliffs", "gki")