Making GatewayFormChooser work

Change-Id: I400e9f40c15c4c036972f13a1c1d14bf41e9f858