Merge "Using a list to store usage events" into pi-dev
am: 10b77a39a2

Change-Id: I92f83289bd5a10b0a17012c2fd993ade0033375e