Merge "Rename badge icon method" into oc-dev
am: ed8d07f213

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a