Merge "Delete code for legacy VR services." into main