Remove imports of bare Id classes

Change-Id: I670ce718ec53bf82ce6ecd3631ec33cc0fbc1ea6
3 files changed