Merge "Fixed duplication conversation on restore Made recipients storage for mms same as for sms." into nyc-dev
am: c058ea9f40

* commit 'c058ea9f4059639aae957e2438d9f317a009d49a':
  Fixed duplication conversation on restore Made recipients storage for mms same as for sms.