Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I7fb9c4cd6221c8d6b136de42eb0ed6dd15c5474d