Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Make transitive starlark loads explicit

Change-Id: I203c8bd3a523041ad0d323584a8878a54b1e4cd9