Update visibility and config at the same time
am: f4479eef64

Change-Id: Ia16c263532bf8018b10f6dffdbc7b52d366babab