Fix plugin bazel build and test -in master branch

Change-Id: I1ddde82f0d9b0b6bd6bf50dc44184addae745746
2 files changed