am 306eac5f: am f82b029c: Merge "Check UID instead of package name when...
am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
* commit '306eac5f':
Check UID instead of package name when preparing VPN.