Merge "Merge "Statsd testdrive: remove debug line." into rvc-dev am: 4a0fe521 am: dae7609a" into rvc-d1-dev-plus-aosp