Merge "Using a list to store usage events" into pi-dev