Fix incorrect mappings for some iconic classes

Change-Id: Ieeb7159768453a17b01b8e2a59289b256c6c3492
1 file changed