Minor visibility changes to make tests work again.

Change-Id: I023974f9f145ec9b39b6d8a1c3b1679638dd59f7
4 files changed