Merge "Fix issue where bouncer would go away" into pi-dev am: fddbae9c78
am: 574eff078d

Change-Id: I5789ab85d4e43ce7c6fdbfbaaccc746a77a4f0df