Merge "Bouncer visibility fixes" into pi-dev
am: 606440f142

Change-Id: I14ed1a28b0ac56bcdd258cc528f7be30ae2badd8