Merge "Remove @ModemCount enum definitions."