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

* commit '6bad401ce83028ea73d8356f82aa42520a3d8aad':