Merge "Add stable/lithium for vpnservice"