Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ic4f5fd18ede39ce466474bd1977a3b0b661be3b2