Merge "Fix atest statsd_test" into rvc-dev am: 8650e9aa11 am: 6e80428408

Change-Id: Ia3ab1caf59e59cc7d54f697dfb77da772e734520