Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
1 file changed