Fixes setting visibility

Closes-Bug:#1343160

Change-Id: I9754d674d4289c0dc0c430e465810ef7d15d47b1
Merge "Fixes setting visibility"