Revert "Revert "Reduce allocations on location delivery""

This reverts commit 3aed7fe724bf01a9ac5ba24cbc6e9b992551070f.

Reason for revert: Real root cause found, reverting back to original code.

Change-Id: I1ba2c78de1ead917b9b3983608fc9056fc647e79
1 file changed