Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17
am: 0867543a06
* commit '0867543a064a48a1aca6243a3d1cdf7a12ad94c8':
Change-Id: I3a72f7329b896aa0c107ddf823aafd4480042f29
This commit is contained in: