Support not displaying an icon in chips am: a233af88e3
am: abbbd82940

Change-Id: I325ae245388a3916d202a79eb47989ed4f2d5795