Update visibility and config at the same time am: f4479eef64
am: f14f166d06

Change-Id: I4bea3173a2e18647ba7ddde529b866bfdbb53dce