Reduce visibility scope

Change-Id: I35e303c54a3248879b1e83ff9e6934da20d0b88a
Merge "Reduce visibility scope"