Merge "VpnSettings stub unit tests"