Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Iff0892a6b6b0a578bef25983b680f083a6e26644