Merge "Guarding collisions in TimeSparseArray" into pi-dev am: 6da53af9c5
am: b334f1b2e9

Change-Id: I7e65cc4b1caa08b8303fd2c4db1fe7e0cf0b2481