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