Merge "Revert "Revert "Revert "Limit access to the device's fixed 802.11 MAC address.""""
am: 0575d7bc9e

Change-Id: I3ba68933d6c5ef17a3c08d08d8bf45b7b6ff94b2