Merge "VpnManager: Log categorization"