Merge "Modify VPN unit tests to include SDK sandbox UIDs." into tm-dev