Minor changes to SMS de-duping changes. am: 2240df7
am: b1356ec

* commit 'b1356ecedc3fa4b4c5c0cc34fe1c3b5676fd4633':
  Minor changes to SMS de-duping changes.

Change-Id: If40e1b280e8e1fe246bf877ffe67b8477239ea2e