Merge "Revert "Revert "Updates tests for untrusted app MAC address rest...""