[automerger skipped] Add //visibility:override to allow control over...
[automerger skipped] Add //visibility:override to allow control over inheritance am: 31c43e7f -s ours
am skip reason: Change-Id I8a9c9c5a1bdceaee387c08864ae2b34629e0d46f with SHA-1 51084ff6 is in history
Change-Id: Ib818feda122049c3b02d415efe759702eaeeba6b