Making Check Imports More Agnostic

Change-Id: I0d6640e1b8857571ac50dd5b66c3e164c1d637f2