Merge "Clean up old Context references in ImsConfig" into pi-dev
am: 65ac70515f

Change-Id: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3