update master-with-bazel from master branch