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