We want to avoid associating types with where they can be used. Bug: 237115222 Test: build Change-Id: I4766227e2261d0d57be090933926ff3b439694f6 Merged-In: I4766227e2261d0d57be090933926ff3b439694f6 (cherry picked from commit 81ccf8d719)
81ccf8d719