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