Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Make transitive starlark loads explicit Make transitive starlark loads explicit Change-Id: I39cb9de406a29b0af219f8c0398f37bd32b0df3d