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

Change-Id: I5f5a46cdfbb6ae521d7b909346fb477e9637664f