Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I0b7ded82c7c82e1fece52302a1287f2160ac5a5e