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

* commit '65bbc6c42d8e35b77f50d794e302da3d63a0b8ae':