Merge 4198880546f1c7f670c822936a49d05da3927c58 on remote branch

Change-Id: Ideb2f6c790d9d5edf8c13722847183cbe70ae8ec

BUILD.bazel

@@ -18,6 +18,10 @@ define_modules("blair", "consolidate")
 
 define_modules("blair", "gki")
 
+define_modules("holi", "consolidate")
+
+define_modules("holi", "gki")
+
 define_modules("cliffs", "consolidate")
 
 define_modules("cliffs", "gki")