am e6c13d0d: am 1735120e: Merge "Fix the incorrect rule to check for SmsAddress" into ics-mr1

* commit 'e6c13d0d810c7ac11a4f9b84f6eb8d5ea6ef69e1':
  Fix the incorrect rule to check for SmsAddress