Use private scope where possible in client

Change-Id: Id40bf9c49f782a374d329fd3d43500417571b33e
Merge "Use private scope where possible in client"