Remove privacy guard (2)

Change-Id: Ic9e7851287d86d7fc2c0f9c06d5c93d4031c968c