Merge pull request #1941 from ehsannas/bazel_build