Merge "NFC: Switch CHECK_INTERFACE to be a more friendly macro statement."