Merge "Temporarily disable retry on bouncer when pattern" into qt-r1-dev
am: 30ff6c674f

Change-Id: I834affd90cd01fe0cee78a1feb0ae5086e9cf228