Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ic5a6a713c58b41b9dc0f06f1cb2b9fff79e4ee48