Merge "Randomize the local Wifi IPv4 address"
am: 13cb6084e2

Change-Id: I2aa4170c8f0b277d6c6e3489012c3698ab3d3229