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