Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09' * commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09': Use the new keystore API in vpn service.
Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09' * commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09': Use the new keystore API in vpn service.