am 067af269: am 01383571: am 07bebe8b: Reconcile with ics-mr1-release

* commit '067af269edf76260e1b0b07ea46896299d5f01ec':
  Don't use SNR in the invalid check.