Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0
  Fix NullPointerExceptions

Change-Id: I73edc6d27076f241d49bbd169836a16216886783