am 07bebe8b: Reconcile with ics-mr1-release

* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
  Don't use SNR in the invalid check.