Merge "Remove @hide usages from statsd apex"