Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I0a1717ed96101d7426a649a2c9a842bfe1c43709