Merge "Clear the past buckets for no-report metrics" into pi-dev am: c0775117c4
am: 6e7821ec66

Change-Id: Ief582aa48afcfb0c6fe5b683bfa5b4ffa20ac80a