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

Change-Id: I47d75c32ccd4bcbbb2f05637fcbae216d7e15015