Merge "Bouncer retry polish" into qt-dev am: d38f0d3440
am: ab0bf513e8

Change-Id: Ie841b93a38082c49ba9ad03be45be3f81c834e16