Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I610b83daa900ce48f3e20a2ee2049f7b7d4ea2fd