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

* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':