Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: eb036399eb
am: 7761f504ec
Change-Id: I0a741fc6c4766b4d402cb50886a6a45fa6505f21
This commit is contained in: