Merge "[automerger skipped] Fix visibility rules for apex/statsd am: 3001a82d2c -s ours"