Merge "Optimizing TimeSparseArray#put in case of collisions" into pi-dev
am: 7eee509df5

Change-Id: I94fcc01c6a767fb21f962dd36fc2c464650cb5cb