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

Change-Id: I372570965e1199bb15343eba5740f71ed11cb3b7