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