am e94985a2: Merge "Increase the scope of other reused definitions."

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