Merge "Statsd config TTL" into pi-dev
am: 48920ab48d

Change-Id: I2b06fd144ed95ff2dc1df09a906b073d856a063d