am c337a961: am ba0cecf8: Increase the scope of other reused definitions.

* commit 'c337a961240baaa8529968d4e30e81621fba9ca5':
  Increase the scope of other reused definitions.