Merge "CTS: Fix cts on gsi for statsd" into pi-dev