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

Change-Id: Ie6c8249a552039bf2d1de588529e9464338d3f67