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

Change-Id: I451c5cfcdd6cfdab0d47e2430cfe5d58a5818150