am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1

* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.