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