Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Make transitive starlark loads explicit
  Make transitive starlark loads explicit
  Make transitive starlark loads explicit

Change-Id: I49ba3aea2d97ff18cec66a4caff2f4825751a2e1