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

Change-Id: Id38fbac4ac1c43cfa0921bc4e3a89a7887d067aa