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

Change-Id: Ia63126c78e88a8541136fca25e6b43ad8da4fc32