[DO NOT MERGE] legacy icon treatment / circle detection
Bug: 37357483

Change-Id: I63049ad61ad259f546fcf5077ded0a5f444e4395
7 files changed