Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: cafa42b471
am: e08c48dc07
Change-Id: I91b3d5e5b81a48947eb892e4311464e65846ffb5
This commit is contained in: