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

Change-Id: I6ba6ff0c5acf845c8838224c0fea2ea62de112f0