addressed jeffvance's review comments fix verify-bazel failure
Further work is needed to isolate dependencies on shared tooling.