Merge "Add some more visibility test cases."
am: d14e5c6ed4

Change-Id: I6a004dccc44c40ff14096cde952b07874fbe3e88