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

* commit 'a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':