Use address_params not params hash

Change-Id: I1ccb299b04cc289ce8e620bb9a6faa79190451e0