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

Change-Id: Ifbcb7efaaacb9a86d9f4adb6a0e0c846f40c41bf