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

Change-Id: I0a2c335af6b0927dc086849a2cf707f53c3e7a20