Merge "Revert "Updates tests for untrusted app MAC address restrictions""