89bf3e3aa2
0ab7ea1701
am: 9355427d9a * commit '9355427d9a': Make some of the UID-based VPN code reusable Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
9355427d9a