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