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

Change-Id: I5954542cee188e4226adececcc07e9beea81ad91