Merge "Updates tests to handle MAC address restrictions."
am: 20d481c5f6

Change-Id: I55f94372119ac63bcc8320279818f164305af955