Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I8a47a89a0a80ca359cbc35864bee6e2756c3760a