Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Documentation: Remove bazel issue
  Documentation: Refactor to match other plugin documentation

Change-Id: Iaaf6b39bf33f29bec3820d2987f0858a49eca324