Re-enable badges, with all dots am: f77a6f7fd7
am: 19d2e7fc55

Change-Id: Idd130cb89d097dd76eb0a695fe1bdf4adeb1f20d