Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e am: b95a19ca46
am: e4e98a1f7c

Change-Id: I3c8a694462811c7aa8270990fcecf5fe0ddd9125