Merge "Set default visibility to private" am: 65f62a8cef
am: 081bb03d1d

Change-Id: If3acea421d5f92dbad02e0af90542f1792b75fdf