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