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