Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I3aa5de554b7a7832397740769383aa5ed2a5fc6a