resolve same recipient being added when double click email address. am: e5c0625148 am: 08fae230aa
am: 029e606f8c

Change-Id: I65b739d1e2981c962e708076d57fa0e6ff499185