Merge "Revert "Revert "Revert "Limit access to the device's fixed 802.11 MAC address.""""