Merge "Fix statsd publicapi stub default usage" into rvc-dev am: 578cac6e am: 893b1613 am: 96c3bf26 am: 7138d75a Change-Id: Ia449257b8a6ec268eb89d0d405f18844261de88e