Merge "Don't use SNR in the invalid check." into ics-mr1