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

* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
  Don't use SNR in the invalid check.