Reduce visibility scope

Change-Id: I29878bfddb1fddb2498b9df5e3edf6d2011bba4c
Merge "Reduce visibility scope"