Merge "Add in sandbox UIDs when configuring VPN." into tm-dev