WPS: Update MAC address on address changes am: b18a958c2e
am: a9a3843964

Change-Id: I2c921f762dc43704c5e2d8ec7d42c22b07cb9e3c