a15b232ddf
We need to make sure that we select the correct gateway address after an upgrade. Change-Id: I06283bd1994467202349bd537e9522fd2fa0c690