Merge "Fix statsd publicapi stub default usage" into rvc-dev am: 578cac6e am: f719ea77 am: 1fba403d am: f8557540 Change-Id: Icd6fa6cb4957925b4f9ccc06f52d460c40a52361