Branch BounceHandler

Change-Id: I4e6b67dc7468a65017bffc32da2416cfce9b945d