SWAT update for BounceHandler

Grabs:
  I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4

Change-Id: Ib3a11c4e7e22a88cab56f23e35c01ca022798b4b