Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I5f44c9e6fbe47e686dadfa4224a549a95bb3dff9