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: I4a09365c936659dd10871f51b4a96eff4c581475