Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I13ea76392d6fa5992b2c82c01ca1ffc6ee315e8f