Merge branch 'stable-2.16'

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

Change-Id: I248732cf304c42b63d9b74ce775c7598957b8a6a