Update BounceHandler to 1.25wmf8 HEAD

Change-Id: I9b26893c5cc7610a8c9a1f6a317f4958daf4fea1