Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 -s ours am: b07add8e -s ours" into rvc-qpr-dev-plus-aosp