Merge "Treat groups of conversations as a conversation" into rvc-dev am:...
Merge "Treat groups of conversations as a conversation" into rvc-dev am: 1e75b1f5 am: 548a77ae am: a47c0c04 am: 4f124071 am: d06859ff
Change-Id: Ic2f7f43762b419e90a63bf383c6e74300df0082e